From: kaf24@localhost.localdomain <kaf24@localhost.localdomain>
Date: Fri, 27 Oct 2006 17:15:14 +0000 (+0100)
Subject: [XEND] Do not delete VNC password from configuration.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15567^2~191
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9033715d28cd38be5ca1ff9b01f4bb7f92d56f63;p=xen.git

[XEND] Do not delete VNC password from configuration.
Fixes reboot of HVM guest when VNC authentication is in use.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 8a761d89cf..95099e7655 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -361,9 +361,6 @@ class HVMImageHandler(ImageHandler):
 
         if nographic:
             ret.append('-nographic')
-            # remove password
-            if vncpasswd_vmconfig:
-                config.remove(['vncpasswd', vncpasswd_vmconfig])
             return ret
 
         if vnc:
@@ -395,9 +392,6 @@ class HVMImageHandler(ImageHandler):
             if vncpasswd != '':
                 self.vm.storeVm("vncpasswd", vncpasswd)
 
-        # remove password
-        config.remove(['vncpasswd', vncpasswd_vmconfig])
-
         return ret
 
     def createDeviceModel(self):